bitkeeper revision 1.105.1.7 (3e622fe35xVBV5lBc1h1Oaan0MH1_A)

Makefile:
  Force UTS_MACHINE to 'i386' rather than 'xeno'. This keeps software installers happy.

diff --git a/xenolinux-2.4.21-pre4-sparse/Makefile b/xenolinux-2.4.21-pre4-sparse/Makefile
index d7a36f6fe0cababcb61f789c69a7666a2fb9fb1d..29cdd72d2aa799f3b88de3d97e655ee0019047f0 100644 (file)
--- a/xenolinux-2.4.21-pre4-sparse/Makefile
+++ b/xenolinux-2.4.21-pre4-sparse/Makefile
@@ -8,7 +8,8 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
 # Xeno hack XXX
-ARCH=xeno
+ARCH    := xeno
+SUBARCH := i386
 
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")
 
@@ -361,7 +362,7 @@ include/linux/version.h: ./Makefile
 comma  := ,
 
 init/version.o: init/version.c include/linux/compile.h include/config/MARKER
-       $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
+       $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(SUBARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
 
 init/main.o: init/main.c include/config/MARKER
        $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $@ $<